From 37e787619ef10cdaaad91e0f886e87a8da31449e Mon Sep 17 00:00:00 2001 From: "awilliam@xenbuild.aw" Date: Tue, 23 May 2006 15:10:27 -0600 Subject: [PATCH] [IA64] Add -rc support to sparse-merge Signed-off-by: Aron Griffis --- xen/arch/ia64/tools/sparse-merge | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/xen/arch/ia64/tools/sparse-merge b/xen/arch/ia64/tools/sparse-merge index 66433187c4..83017bc4a7 100755 --- a/xen/arch/ia64/tools/sparse-merge +++ b/xen/arch/ia64/tools/sparse-merge @@ -33,9 +33,17 @@ fi cd $LINUXPATH || exit 1 OLDCSET=$(hg parents | awk '/^changeset:/{print($2)}' | cut -f 1 -d :) for t in $OLDTAG $NEWTAG; do + [[ $t == *.* ]] || continue if ! hg tags | cut -f1 -d' ' | grep -Fx $t; then echo "Tag $t not found, ketching up" - hg up -C ${t%.*} || exit 1 + if [[ $t == *-* ]]; then + # rc/pre/git versions start at the previous stable release + micro=${t%%-*}; micro=${micro##*.} + stable=${t%%-*}; stable=${stable%.*}.$((micro-1)) + hg up -C $stable + else + hg up -C ${t%.*} || exit 1 + fi ketchup ${t#v} || exit 1 hg addremove hg ci -m $t -- 2.30.2